Client servicing in the definition of the trading book

According to Article 4(1)(85) and (86) of Regulation (EU) No 575/2013 CRR, are all proprietary positions and all positions arising from client servicing and market making trading book positions, irrespective if they are held for short term or not?

It is not clear if the scope of the trading book according to Article 11 of Directive 2006/49/EC (CAD) – abrogated by Directive 2013/36/UE - is the same as the scope of the trading book according to Article 4(1) (85 and 86) Capital Requirements Regulation (CRR). The wording of Article 4(1)(85) and (86) CRR could suggest a wider scope of the trading book than it was under the CAD. In particular, one could think that Article 4(1)(85 and 86) CRR makes all proprietary positions and all positions arising from client servicing and market making trading book positions - no matter if they are held for trading or not. Article 11 CAD was instead more precise and its wording made very clear that proprietary positions and positions arising from client servicing and market making are trading book positions only if they are held for trading, i.e. if they are held with the intention "to be resold short term" or with the intention "to benefit from actual or expected short-term price differences between buying and selling prices or from other price or interest rate variations".