Merge branch '20140213_N20N21N22_transient'