No.

Number 1 is the small config which I use (and have used in production).

Number 2 seems to be fixed in some other way somewhere between revision 4305 and 4621. I started to read thru all the commits to find what they had done to solve the problem but it was to much work for me. It won't be needed for 2.2 where we will just need to config.